Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2011 04:52:52 +0000 (20:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2011 04:52:52 +0000 (20:52 -0800)
commit356ae514f342cbd6b448d7f04fce4b4ce385d29e
tree89f6a6c823a3706c57bdc929e5b9064182ec8065
parenta4cafc4eea89b0aa44a673d6fcac648f8275db02
parentcc36cd4a5a2603fd0f2dff6a8984c419defda0fb
Merge from trunk.